fix: Avoid null exception in removeSubquery #147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
viirya
commented
Mar 1, 2024
| @@ -47,10 +47,12 @@ public static synchronized void setSubquery(long planId, ScalarSubquery subquery | |||
| } | |||
|
|
|||
| public static synchronized void removeSubquery(long planId, ScalarSubquery subquery) { | |||
| subqueryMap.get(planId).remove(subquery.exprId().id()); | |||
| if (subqueryMap.containsKey(planId)) { | |||
| subqueryMap.get(planId).remove(subquery.exprId().id()); | |||
There was a problem hiding this comment.
I hit NPE here while working sort merge join PR. I think it is possible that the query plan has duplicate subqueries (e.g., reused subquery), so if it may try to do removal of subquery after the map was clean up.
There was a problem hiding this comment.
It maybe hard to create a test query without join to reproduce it. So I leave a test out here. But this change looks straightforward.
There was a problem hiding this comment.
This looks correct to me.
One possible way to construct such cases:
val subquery =
new Column(ScalarSubquery(spark.range(10).selectExpr("max(id)").logicalPlan)).as("subquery")
val df = spark.range(1000).select($"id", subquery).filter("id == subquery")
Disclaimer: this case is not verified.
sunchao
approved these changes
Mar 1, 2024
|
Merged. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #.
Rationale for this change
In
CometScalarSubquery.removeSubquery, we should make sure theplanIdis still insubqueryMapbefore we go to delete subquery from it. Otherwise, null exception could be thrown.What changes are included in this PR?
How are these changes tested?